snapshot: Refactor some device code
authorTimm Bäder <mail@baedert.org>
Sun, 11 Oct 2020 09:55:04 +0000 (11:55 +0200)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 14 Oct 2020 19:06:12 +0000 (15:06 -0400)
Make a bit clearer what this does.

gtk/gtkstylecontext.c

index 4150df3ae73d9c76f35b29c8744035aff89c39b3..708e61f9fbb7ab209759f55d362cc77a4c7764d9 100644 (file)
@@ -1141,7 +1141,6 @@ gtk_snapshot_render_insertion_cursor (GtkSnapshot     *snapshot,
   PangoRectangle strong_pos, weak_pos;
   PangoRectangle *cursor1, *cursor2;
   GdkSeat *seat;
-  GdkDevice *keyboard;
   PangoDirection keyboard_direction;
   PangoDirection direction2;
 
@@ -1155,15 +1154,15 @@ gtk_snapshot_render_insertion_cursor (GtkSnapshot     *snapshot,
                 "gtk-cursor-aspect-ratio", &aspect_ratio,
                 NULL);
 
+  keyboard_direction = PANGO_DIRECTION_LTR;
   seat = gdk_display_get_default_seat (priv->display);
   if (seat)
-    keyboard = gdk_seat_get_keyboard (seat);
-  else
-    keyboard = NULL;
-  if (keyboard)
-    keyboard_direction = gdk_device_get_direction (keyboard);
-  else
-    keyboard_direction = PANGO_DIRECTION_LTR;
+    {
+      GdkDevice *keyboard = gdk_seat_get_keyboard (seat);
+
+      if (keyboard)
+        keyboard_direction = gdk_device_get_direction (keyboard);
+    }
 
   pango_layout_get_cursor_pos (layout, index, &strong_pos, &weak_pos);